Update GtkGrid definitions in GtkBuilder files

author Emmanuele Bassi <ebassi@gnome.org>

Thu, 4 Apr 2019 23:08:18 +0000 (00:08 +0100)

committer Emmanuele Bassi <ebassi@gnome.org>

Thu, 4 Apr 2019 23:08:18 +0000 (00:08 +0100)
author Emmanuele Bassi <ebassi@gnome.org>
Thu, 4 Apr 2019 23:08:18 +0000 (00:08 +0100)
committer Emmanuele Bassi <ebassi@gnome.org>
Thu, 4 Apr 2019 23:08:18 +0000 (00:08 +0100)
diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui

index 3d4996fa45a44e0ff9976b25be3263f18c8c4c05..e339138a8ab44158f006c0951d06a202a531597b 100644 (file)
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkAboutDialog" parent="GtkDialog">
      <property name="resizable">0</property>
diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui

index e309422f76dc1ca9f5b890849dfba24219024144..c04757ec03565201c082e08f03ba4d6643e876b8 100644 (file)
--- a/gtk/ui/gtkappchooserdialog.ui
+++ b/gtk/ui/gtkappchooserdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkAppChooserDialog" parent="GtkDialog">
      <property name="title" translatable="yes">Select Application</property>
diff --git a/gtk/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui

index d23a402ca8c4bf2569846db9620e78c5e13667d9..a87ec7b34313fa95a4881acd60c0a6c8e11ca90a 100644 (file)
--- a/gtk/ui/gtkappchooserwidget.ui
+++ b/gtk/ui/gtkappchooserwidget.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <object class="GtkListStore" id="program_list_store">
      <columns>
diff --git a/gtk/ui/gtkapplication-quartz.ui b/gtk/ui/gtkapplication-quartz.ui

index 42fc3127b2b61d52f34976b884db3344e42654cd..e41df2d337b9694bc729e9e7338e54d1753c24b3 100644 (file)
--- a/gtk/ui/gtkapplication-quartz.ui
+++ b/gtk/ui/gtkapplication-quartz.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <menu id="app-menu">
      <section>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui

index f39fbf494be962fa7bb992a9cfc997d92d60943b..d3f760e2e19e8ac6679d4af33b23876e4883dfe3 100644 (file)
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkAssistant" parent="GtkWindow">
      <child type="titlebar">
diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui

index 7eb0d14636c265faa491e8eaf9cb21b6f3b1274c..767e3bdb41a068fe4d836cfcdcd94398fdc9a6b0 100644 (file)
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkColorChooserDialog" parent="GtkDialog">
      <property name="title" translatable="yes">Select a Color</property>
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui

index fb650a34d83b21e6515316ad857d51f02c0bee4c..2b24dbfd0ec02956c8d03ca2997df243d94e5fcd 100644 (file)
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <object class="GtkAdjustment" id="a_adj">
      <property name="upper">1</property>
@@ -44,11 +45,11 @@
                  <style>
                    <class name="circular"/>
                  </style>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
              </child>
              <child>
                <object class="GtkColorSwatch" id="swatch">
@@ -57,11 +58,11 @@
                  <property name="rgba">rgb(255,255,255)</property>
                  <property name="selectable">False</property>
                  <property name="has-menu">False</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
              </child>
              <child>
                <object class="GtkEntry" id="entry">
@@ -74,11 +75,11 @@
                  <signal name="activate" handler="entry_apply" swapped="no"/>
                  <signal name="notify::has-focus" handler="entry_focus_changed" swapped="no"/>
                  <signal name="notify::text" handler="entry_text_changed" swapped="no"/>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">0</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">0</property>
-              </packing>
              </child>
              <child>
                <object class="GtkColorScale" id="h_slider">
@@ -88,11 +89,11 @@
                  <property name="draw-value">False</property>
                  <property name="has-origin">False</property>
                  <signal name="popup-menu" handler="popup_edit" swapped="no"/>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
              </child>
              <child>
                <object class="GtkColorScale" id="a_slider">
@@ -105,12 +106,12 @@
                    <class name="marks-before"/>
                  </style>
                  <signal name="popup-menu" handler="popup_edit" swapped="no"/>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">2</property>
+                  <property name="column-span">2</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-                <property name="width">2</property>
-              </packing>
              </child>
              <child>
                <object class="GtkColorPlane" id="sv_plane">
@@ -121,12 +122,12 @@
                  <property name="s-adjustment">s_adj</property>
                  <property name="v-adjustment">v_adj</property>
                  <signal name="popup-menu" handler="popup_edit" swapped="no"/>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                  <property name="column-span">2</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-                <property name="width">2</property>
-              </packing>
              </child>
            </object>
          </child>
@@ -149,11 +150,11 @@
          <child>
            <object class="GtkLabel" id="label4">
              <property name="label" translatable="yes" context="Color channel">A</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkSpinButton" id="a_entry">
@@ -166,11 +167,11 @@
                  <property name="AtkObject::accessible-name" translatable="yes">Alpha</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
        </object>
      </child>
@@ -191,11 +192,11 @@
          <child>
            <object class="GtkLabel" id="label3">
              <property name="label" translatable="yes" context="Color channel">H</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkSpinButton" id="h_entry">
@@ -208,11 +209,11 @@
                  <property name="AtkObject::accessible-name" translatable="yes">Hue</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
        </object>
      </child>
@@ -234,20 +235,20 @@
          <child>
            <object class="GtkLabel" id="label1">
              <property name="label" translatable="yes" context="Color Channel">S</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel" id="label2">
              <property name="label" translatable="yes" context="Color Channel">V</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkSpinButton" id="s_entry">
@@ -260,11 +261,11 @@
                  <property name="AtkObject::accessible-name" translatable="yes">Saturation</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkSpinButton" id="v_entry">
@@ -277,11 +278,11 @@
                  <property name="AtkObject::accessible-name" translatable="yes">Value</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
        </object>
      </child>
diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui

index 9cd3b3d7354ad9606fab8045052edf629f0d98d2..41b5754b75ea9c4faedf3120d680d948003b57ab 100644 (file)
--- a/gtk/ui/gtkcombobox.ui
+++ b/gtk/ui/gtkcombobox.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkComboBox" parent="GtkBin">
      <child>
diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui

index 33d768e86a662d893e659d125bdad171ffa7d131..9c83c84207d47b3aca1830ef88ae75584fcc8329 100644 (file)
--- a/gtk/ui/gtkdialog.ui
+++ b/gtk/ui/gtkdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkDialog" parent="GtkWindow">
      <property name="window-position">center-on-parent</property>
diff --git a/gtk/ui/gtkemojichooser.ui b/gtk/ui/gtkemojichooser.ui

index dfa5357f49eefb88cd05514a19d816423abef5bf..1f7a2e9485297f38de76113c371e69fa6d1540af 100644 (file)
--- a/gtk/ui/gtkemojichooser.ui
+++ b/gtk/ui/gtkemojichooser.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkEmojiChooser" parent="GtkPopover">
      <style>
@@ -309,11 +310,11 @@
                          <style>
                            <class name="dim-label"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkLabel">
@@ -322,11 +323,11 @@
                            <attribute name="weight" value="bold"></attribute>
                            <attribute name="scale" value="1.44"></attribute>
                          </attributes>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkLabel">
@@ -334,11 +335,11 @@
                          <style>
                            <class name="dim-label"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                      </packing>
                      </child>
                    </object>
                  </property>
diff --git a/gtk/ui/gtkemojicompletion.ui b/gtk/ui/gtkemojicompletion.ui

index 964b4bf26c445c22fdee912776fd5b54321bf3ef..0abdb7742ae3cb533115c66dfedd3d6f4f4501ad 100644 (file)
--- a/gtk/ui/gtkemojicompletion.ui
+++ b/gtk/ui/gtkemojicompletion.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkEmojiCompletion" parent="GtkPopover">
      <property name="modal">0</property>
diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui

index f8b454e90da65be72e1ffb49f2d9c7445e99f581..4434b186de6a82816809d937ecb1811e827bbc8c 100644 (file)
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkFileChooserDialog" parent="GtkDialog">
      <property name="type-hint">dialog</property>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui

index 84ea0e9f987f3b6591cf32e646490bd7ab7edd9c..9ea493cec9dea6ac81abd556e2af356194dcc7cb 100644 (file)
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkFileChooserWidget" parent="GtkWidget">
      <child>
@@ -284,11 +285,11 @@
                                          <style>
                                            <class name="dim-label"/>
                                          </style>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel">
@@ -297,11 +298,11 @@
                                            <attribute name="weight" value="bold"></attribute>
                                            <attribute name="scale" value="1.44"></attribute>
                                          </attributes>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel">
@@ -309,11 +310,11 @@
                                          <style>
                                            <class name="dim-label"/>
                                          </style>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                      </child>
                                    </object>
                                  </property>
@@ -389,10 +390,10 @@
              <attributes>
                <attribute name="weight" value="bold"></attribute>
              </attributes>
+            <layout>
+              <property name="column-span">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="width">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkEntry" id="new_folder_name_entry">
@@ -400,11 +401,11 @@
              <property name="activates-default">1</property>
              <property name="hexpand">1</property>
              <signal name="changed" handler="new_folder_name_changed"/>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkButton" id="new_folder_create_button">
@@ -416,19 +417,20 @@
              <style>
                <class name="suggested-action"/>
              </style>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
-          <object class="GtkFileChooserErrorStack" id="new_folder_error_stack"/>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-            <property name="width">2</property>
-          </packing>
+          <object class="GtkFileChooserErrorStack" id="new_folder_error_stack">
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+              <property name="column-span">2</property>
+            </layout>
+          </object>
          </child>
        </object>
      </child>
@@ -449,20 +451,20 @@
              <attributes>
                <attribute name="weight" value="bold"></attribute>
              </attributes>
+            <layout>
+              <property name="column-span">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="width">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkEntry" id="rename_file_name_entry">
              <property name="activates-default">1</property>
              <signal name="changed" handler="rename_file_name_changed"/>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkButton" id="rename_file_rename_button">
@@ -474,19 +476,20 @@
              <style>
                <class name="suggested-action"/>
              </style>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
-          <object class="GtkFileChooserErrorStack" id="rename_file_error_stack"/>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-            <property name="width">2</property>
-          </packing>
+          <object class="GtkFileChooserErrorStack" id="rename_file_error_stack">
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+              <property name="column-span">2</property>
+            </layout>
+          </object>
          </child>
        </object>
      </child>
diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui

index be72f3908c92a6d8a0e3347d1ddc07ad5a450155..72c314a14f1dd52dc98458aa937451c7b82c3bbd 100644 (file)
--- a/gtk/ui/gtkfontchooserdialog.ui
+++ b/gtk/ui/gtkfontchooserdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkFontChooserDialog" parent="GtkDialog">
      <property name="title" translatable="yes">Select Font</property>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui

index 0ffb9fe434f2ed30b0f0ba134703b91c9a8c370a..1a4ea543ae9b5dbbf828b9d46cc654406af7a6c9 100644 (file)
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <object class="GtkListStore" id="model">
      <columns>
@@ -41,11 +42,11 @@
                      <property name="placeholder-text" translatable="yes">Search font name</property>
                      <signal name="search-changed" handler="text_changed_cb" swapped="no"/>
                      <signal name="stop-search" handler="stop_search_cb" swapped="no"/>
+                    <layout>
+                      <property name="left-attach">0</property>
+                      <property name="top-attach">0</property>
+                    </layout>
                    </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
                  </child>
                  <child>
                    <object class="GtkStack" id="list_stack">
@@ -94,12 +95,12 @@
                                      </child>
                                    </object>
                                  </child>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">1</property>
+                                  <property name="column-span">3</property>
+                                </layout>
                                </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">1</property>
-                                <property name="width">3</property>
-                              </packing>
                              </child>
                              <child>
                                <object class="GtkEntry" id="preview">
@@ -111,23 +112,23 @@
                                      <signal name="scroll" handler="resize_by_scroll_cb"/>
                                    </object>
                                  </child>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">2</property>
+                                  <property name="column-span">3</property>
+                                </layout>
                                </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">2</property>
-                                <property name="width">3</property>
-                              </packing>
                              </child>
                              <child>
                                <object class="GtkLabel" id="size_label">
                                  <property name="label" translatable="yes">Size</property>
                                  <property name="xalign">0</property>
                                  <property name="valign">baseline</property>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">3</property>
+                                </layout>
                                </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">3</property>
-                              </packing>
                              </child>
                              <child>
                                <object class="GtkScale" id="size_slider">
@@ -142,11 +143,11 @@
                                      <signal name="scroll" handler="resize_by_scroll_cb"/>
                                    </object>
                                  </child>
+                                <layout>
+                                  <property name="left-attach">1</property>
+                                  <property name="top-attach">3</property>
+                                </layout>
                                </object>
-                              <packing>
-                                <property name="left-attach">1</property>
-                                <property name="top-attach">3</property>
-                              </packing>
                              </child>
                              <child>
                                <object class="GtkSpinButton" id="size_spin">
@@ -154,11 +155,11 @@
                                  <property name="adjustment">spin_adjustment</property>
                                  <property name="valign">center</property>
                                  <signal name="output" handler="output_cb"/>
+                                <layout>
+                                  <property name="left-attach">2</property>
+                                  <property name="top-attach">3</property>
+                                </layout>
                                </object>
-                              <packing>
-                                <property name="left-attach">2</property>
-                                <property name="top-attach">3</property>
-                              </packing>
                              </child>
                            </object>
                          </property>
@@ -181,11 +182,11 @@
                                <object class="GtkImage">
                                  <property name="gicon">fonticon</property>
                                  <property name="pixel-size">64</property>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">0</property>
+                                </layout>
                                </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">0</property>
-                              </packing>
                              </child>
                              <child>
                                <object class="GtkLabel">
@@ -194,21 +195,21 @@
                                    <attribute name="weight" value="bold"></attribute>
                                    <attribute name="scale" value="1.2"></attribute>
                                  </attributes>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">1</property>
+                                </layout>
                                </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">1</property>
-                              </packing>
                              </child>
                            </object>
                          </property>
                        </object>
                      </child>
+                    <layout>
+                      <property name="left-attach">0</property>
+                      <property name="top-attach">1</property>
+                    </layout>
                    </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
                  </child>
                </object>
              </property>
@@ -261,11 +262,11 @@
                                  <property name="label" translatable="yes">Size</property>
                                  <property name="xalign">0</property>
                                  <property name="valign">baseline</property>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">0</property>
+                                </layout>
                                </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">0</property>
-                              </packing>
                              </child>
                              <child>
                                <object class="GtkScale" id="size_slider2">
@@ -274,11 +275,11 @@
                                  <property name="adjustment">slider_adjustment</property>
                                  <property name="draw-value">0</property>
                                  <property name="round-digits">0</property>
+                                <layout>
+                                  <property name="left-attach">1</property>
+                                  <property name="top-attach">0</property>
+                                </layout>
                                </object>
-                              <packing>
-                                <property name="left-attach">1</property>
-                                <property name="top-attach">0</property>
-                              </packing>
                              </child>
                              <child>
                                <object class="GtkSpinButton" id="size_spin2">
@@ -286,11 +287,11 @@
                                  <property name="adjustment">spin_adjustment</property>
                                  <property name="valign">center</property>
                                  <signal name="output" handler="output_cb"/>
+                                <layout>
+                                  <property name="left-attach">2</property>
+                                  <property name="top-attach">0</property>
+                                </layout>
                                </object>
-                              <packing>
-                                <property name="left-attach">2</property>
-                                <property name="top-attach">0</property>
-                              </packing>
                              </child>
                            </object>
                          </child>
diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui

index 2dcc1a6aab19d8b94930700492d526338588aafe..66e4e3d78a35c72710db6b9e35d3833c1d3803e9 100644 (file)
--- a/gtk/ui/gtkinfobar.ui
+++ b/gtk/ui/gtkinfobar.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkInfoBar" parent="GtkBox">
      <child>
diff --git a/gtk/ui/gtklockbutton.ui b/gtk/ui/gtklockbutton.ui

index 328c02ff077be3a0de3196bb5b5065688d50db73..820ba63692db611bcf6f3583c1522626a82548a8 100644 (file)
--- a/gtk/ui/gtklockbutton.ui
+++ b/gtk/ui/gtklockbutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkLockButton" parent="GtkButton">
      <property name="can-focus">1</property>
diff --git a/gtk/ui/gtkmediacontrols.ui b/gtk/ui/gtkmediacontrols.ui

index 19eee4f4e2b7e660393520986d156a1d98ee9e6b..011d3f9ca2958abb76176bb9141b60238a4ad46e 100644 (file)
--- a/gtk/ui/gtkmediacontrols.ui
+++ b/gtk/ui/gtkmediacontrols.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <object class="GtkAdjustment" id="time_adjustment">
      <property name="upper">10</property>
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui

index 61f1b3d0956743173c52b1208529a1a376a8172e..c2ec33b1974f569f05fa02fbe17d25c00384d89a 100644 (file)
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkMessageDialog" parent="GtkDialog">
      <property name="title"></property>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui

index 85ffaf0c9a67679d68fe4eb244e77e5fe325be41..78e2c2b6e3dfbd78fb125d18d142e36925c3c8e1 100644 (file)
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <object class="GtkListStore" id="custom_paper_list">
      <columns>
@@ -38,11 +39,11 @@
                  <property name="label" translatable="yes">_Format for:</property>
                  <property name="use-underline">1</property>
                  <property name="mnemonic-widget">printer_combo</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
              </child>
              <child>
                <object class="GtkComboBox" id="printer_combo">
@@ -55,12 +56,12 @@
                      <attribute name="markup">0</attribute>
                    </attributes>
                  </child>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                  <property name="column-span">3</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-                <property name="width">3</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel" id="paper_size_combo_label">
@@ -69,11 +70,11 @@
                  <property name="label" translatable="yes">_Paper size:</property>
                  <property name="use-underline">1</property>
                  <property name="mnemonic-widget">paper_size_combo</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
              </child>
              <child>
                <object class="GtkComboBox" id="paper_size_combo">
@@ -83,23 +84,23 @@
                  <child>
                    <object class="GtkCellRendererText" id="paper_size_cell"/>
                  </child>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                  <property name="column-span">3</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-                <property name="width">3</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel" id="paper_size_label">
                  <property name="halign">start</property>
                  <property name="valign">center</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">2</property>
+                  <property name="column-span">3</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-                <property name="width">3</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel" id="orientation_label">
@@ -108,11 +109,11 @@
                  <property name="label" translatable="yes">_Orientation:</property>
                  <property name="use-underline">1</property>
                  <property name="mnemonic-widget">portrait_radio</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">3</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">3</property>
-              </packing>
              </child>
              <child>
                <object class="GtkRadioButton" id="portrait_radio">
@@ -134,11 +135,11 @@
                      </child>
                    </object>
                  </child>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">3</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">3</property>
-              </packing>
              </child>
              <child>
                <object class="GtkRadioButton" id="reverse_portrait_radio">
@@ -161,11 +162,11 @@
                      </child>
                    </object>
                  </child>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">3</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">3</property>
-              </packing>
              </child>
              <child>
                <object class="GtkRadioButton" id="landscape_radio">
@@ -188,11 +189,11 @@
                      </child>
                    </object>
                  </child>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">4</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">4</property>
-              </packing>
              </child>
              <child>
                <object class="GtkRadioButton" id="reverse_landscape_radio">
@@ -214,11 +215,11 @@
                      </child>
                    </object>
                  </child>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">4</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">4</property>
-              </packing>
              </child>
            </object>
          </child>
diff --git a/gtk/ui/gtkpathbar.ui b/gtk/ui/gtkpathbar.ui

index be2fe8090508ece69306f0f9bb75800433e5b9b4..29fe44c3bd72820894542f01bbef14d6a0a502b6 100644 (file)
--- a/gtk/ui/gtkpathbar.ui
+++ b/gtk/ui/gtkpathbar.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <object class="GtkButton" id="down_slider_button">
      <property name="can-focus">1</property>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui

index 39022efdb9a24a80056e731fa47e4e454055e73e..010612b90f06b7accba5bdbff01186b8ef2eb226 100644 (file)
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <requires lib="gtk+" version="3.16"/>
    <object class="GtkListStore" id="completion_store">
@@ -65,11 +66,11 @@
                  <attributes>
                    <attribute name="weight" value="bold"></attribute>
                  </attributes>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel">
@@ -78,11 +79,11 @@
                  <attributes>
                    <attribute name="weight" value="bold"></attribute>
                  </attributes>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
              </child>
            </object>
          </child>
diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui

index 6225d3b9ecdbe4b2c1d3a2ccc66b3cf822f23e09..e9f9e8908a9d4138bfadc003dc90cc0bc1d66d98 100644 (file)
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <requires lib="gtk+" version="3.16"/>
    <template class="GtkPlacesViewRow" parent="GtkListBoxRow">
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui

index 826811aa6a7689891b9344ce9e72a1887e4c675b..bacfd31e07f7b47d0f6c2edca60ebcce84c27e8f 100644 (file)
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <object class="GtkAdjustment" id="copies_spin_adjustment">
      <property name="lower">1</property>
@@ -169,12 +170,12 @@
                                          <property name="can-focus">1</property>
                                          <property name="use-underline">1</property>
                                          <property name="active">1</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                          <property name="column-span">2</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                        <property name="width">2</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkRadioButton" id="current_page_radio">
@@ -184,12 +185,12 @@
                                          <property name="use-underline">1</property>
                                          <property name="active">1</property>
                                          <property name="group">all_pages_radio</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                          <property name="column-span">2</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                        <property name="width">2</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkRadioButton" id="selection_radio">
@@ -199,12 +200,12 @@
                                          <property name="use-underline">1</property>
                                          <property name="active">1</property>
                                          <property name="group">all_pages_radio</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                          <property name="column-span">2</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                        <property name="width">2</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkRadioButton" id="page_range_radio">
@@ -216,11 +217,11 @@
                                          <property name="active">1</property>
                                          <property name="group">all_pages_radio</property>
                                          <signal name="toggled" handler="update_page_range_entry_sensitivity" swapped="no"/>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkEntry" id="page_range_entry">
@@ -236,11 +237,11 @@
   e.g. 1–3, 7, 11</property>
                                            </object>
                                          </child>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                      </child>
                                      <accessibility>
                                        <relation type="labelled-by" target="label_widget1"/>
@@ -279,11 +280,11 @@
                                          <property name="label" translatable="yes">Copie_s:</property>
                                          <property name="use-underline">1</property>
                                          <property name="mnemonic-widget">copies_spin</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkSpinButton" id="copies_spin">
@@ -292,11 +293,11 @@
                                          <property name="adjustment">copies_spin_adjustment</property>
                                          <signal name="changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
                                          <signal name="value-changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkCheckButton" id="collate_check">
@@ -304,11 +305,11 @@
                                          <property name="can-focus">1</property>
                                          <property name="use-underline">1</property>
                                          <signal name="toggled" handler="update_collate_icon" swapped="no"/>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkCheckButton" id="reverse_check">
@@ -316,22 +317,22 @@
                                          <property name="can-focus">1</property>
                                          <property name="use-underline">1</property>
                                          <signal name="toggled" handler="update_collate_icon" swapped="no"/>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkDrawingArea" id="collate_image">
                                          <property name="content-width">70</property>
                                          <property name="content-height">90</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">1</property>
+                                          <property name="row-span">2</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">1</property>
-                                        <property name="height">2</property>
-                                      </packing>
                                      </child>
                                      <accessibility>
                                        <relation type="labelled-by" target="label_widget2"/>
@@ -391,20 +392,20 @@
                                          <property name="label" translatable="yes">T_wo-sided:</property>
                                          <property name="use-underline">1</property>
                                          <property name="mnemonic-widget">duplex</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkPrinterOptionWidget" id="duplex">
                                          <property name="valign">baseline</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label6">
@@ -413,22 +414,22 @@
                                          <property name="label" translatable="yes">Pages per _side:</property>
                                          <property name="use-underline">1</property>
                                          <property name="mnemonic-widget">pages_per_sheet</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkPrinterOptionWidget" id="pages_per_sheet">
                                          <property name="valign">baseline</property>
                                          <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
                                          <signal name="changed" handler="update_number_up_layout" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label7">
@@ -437,21 +438,21 @@
                                          <property name="label" translatable="yes">Page or_dering:</property>
                                          <property name="use-underline">1</property>
                                          <property name="mnemonic-widget">number_up_layout</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkPrinterOptionWidget" id="number_up_layout">
                                          <property name="valign">baseline</property>
                                          <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label8">
@@ -460,11 +461,11 @@
                                          <property name="label" translatable="yes">_Only print:</property>
                                          <property name="use-underline">1</property>
                                          <property name="mnemonic-widget">page_set_combo</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBoxText" id="page_set_combo">
@@ -477,11 +478,11 @@
                                            <item translatable="yes">Even sheets</item>
                                            <item translatable="yes">Odd sheets</item>
                                          </items>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label9">
@@ -490,11 +491,11 @@
                                          <property name="label" translatable="yes">Sc_ale:</property>
                                          <property name="use-underline">1</property>
                                          <property name="mnemonic-widget">scale_spin</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">4</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">4</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkBox" id="box5">
@@ -514,11 +515,11 @@
                                              <property name="label">%</property>
                                            </object>
                                          </child>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">4</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">4</property>
-                                      </packing>
                                      </child>
                                      <accessibility>
                                        <relation type="labelled-by" target="label_widget3"/>
@@ -557,20 +558,20 @@
                                          <property name="label" translatable="yes">Paper _type:</property>
                                          <property name="use-underline">1</property>
                                          <property name="mnemonic-widget">paper_type</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkPrinterOptionWidget" id="paper_type">
                                          <property name="valign">baseline</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label12">
@@ -579,20 +580,20 @@
                                          <property name="label" translatable="yes">Paper _source:</property>
                                          <property name="use-underline">1</property>
                                          <property name="mnemonic-widget">paper_source</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkPrinterOptionWidget" id="paper_source">
                                          <property name="valign">baseline</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label13">
@@ -601,20 +602,20 @@
                                          <property name="label" translatable="yes">Output t_ray:</property>
                                          <property name="use-underline">1</property>
                                          <property name="mnemonic-widget">output_tray</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkPrinterOptionWidget" id="output_tray">
                                          <property name="valign">baseline</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="paper_size_combo_label">
@@ -623,11 +624,11 @@
                                          <property name="label" translatable="yes">_Paper size:</property>
                                          <property name="use-underline">1</property>
                                          <property name="mnemonic-widget">paper_size_combo</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="paper_size_combo">
@@ -637,11 +638,11 @@
                                          <child>
                                            <object class="GtkCellRendererText" id="paper_size_renderer"/>
                                          </child>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="orientation_combo_label">
@@ -650,11 +651,11 @@
                                          <property name="label" translatable="yes">Or_ientation:</property>
                                          <property name="use-underline">1</property>
                                          <property name="mnemonic-widget">orientation_combo</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">4</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">4</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBoxText" id="orientation_combo">
@@ -669,11 +670,11 @@
                                            <item translatable="yes">Reverse portrait</item>
                                            <item translatable="yes">Reverse landscape</item>
                                          </items>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">4</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">4</property>
-                                      </packing>
                                      </child>
                                      <accessibility>
                                        <relation type="labelled-by" target="label_widget4"/>
@@ -740,18 +741,19 @@
                                      <property name="label" translatable="yes">Pri_ority:</property>
                                      <property name="use-underline">1</property>
                                      <property name="mnemonic-widget">job_prio</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
                                  </child>
                                  <child>
-                                  <object class="GtkPrinterOptionWidget" id="job_prio"/>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
+                                  <object class="GtkPrinterOptionWidget" id="job_prio">
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
+                                  </object>
                                  </child>
                                  <child>
                                    <object class="GtkLabel" id="label17">
@@ -760,29 +762,30 @@
                                      <property name="label" translatable="yes">_Billing info:</property>
                                      <property name="use-underline">1</property>
                                      <property name="mnemonic-widget">billing_info</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                  </child>
                                  <child>
-                                  <object class="GtkPrinterOptionWidget" id="billing_info"/>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
+                                  <object class="GtkPrinterOptionWidget" id="billing_info">
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
+                                  </object>
                                  </child>
                                  <accessibility>
                                    <relation type="labelled-by" target="label_widget5"/>
                                  </accessibility>
                                </object>
                              </child>
+                            <layout>
+                              <property name="left-attach">0</property>
+                              <property name="top-attach">0</property>
+                            </layout>
                            </object>
-                          <packing>
-                            <property name="left-attach">0</property>
-                            <property name="top-attach">0</property>
-                          </packing>
                          </child>
                          <child>
                            <object class="GtkBox" id="frame_template6">
@@ -813,12 +816,12 @@
                                      <property name="use-underline">1</property>
                                      <property name="active">1</property>
                                      <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                      <property name="column-span">2</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">0</property>
-                                    <property name="width">2</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkRadioButton" id="print_at_radio">
@@ -833,11 +836,11 @@
                                      <property name="group">print_now_radio</property>
                                      <signal name="toggled" handler="update_print_at_entry_sensitivity" swapped="no"/>
                                      <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkEntry" id="print_at_entry">
@@ -856,11 +859,11 @@
                                        </object>
                                      </child>
                                      <signal name="changed" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkRadioButton" id="print_hold_radio">
@@ -872,23 +875,23 @@
                                      <property name="use-underline">1</property>
                                      <property name="group">print_now_radio</property>
                                      <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">2</property>
+                                      <property name="column-span">2</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">2</property>
-                                    <property name="width">2</property>
-                                  </packing>
                                  </child>
                                  <accessibility>
                                    <relation type="labelled-by" target="label_widget6"/>
                                  </accessibility>
                                </object>
                              </child>
+                            <layout>
+                              <property name="left-attach">0</property>
+                              <property name="top-attach">1</property>
+                            </layout>
                            </object>
-                          <packing>
-                            <property name="left-attach">0</property>
-                            <property name="top-attach">1</property>
-                          </packing>
                          </child>
                          <child>
                            <object class="GtkBox" id="frame_template7">
@@ -919,18 +922,19 @@
                                      <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the front cover page.">Be_fore:</property>
                                      <property name="use-underline">1</property>
                                      <property name="mnemonic-widget">cover_before</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
                                  </child>
                                  <child>
-                                  <object class="GtkPrinterOptionWidget" id="cover_before"/>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
+                                  <object class="GtkPrinterOptionWidget" id="cover_before">
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
+                                  </object>
                                  </child>
                                  <child>
                                    <object class="GtkLabel" id="label19">
@@ -939,29 +943,30 @@
                                      <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the back cover page.">_After:</property>
                                      <property name="use-underline">1</property>
                                      <property name="mnemonic-widget">cover_after</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                  </child>
                                  <child>
-                                  <object class="GtkPrinterOptionWidget" id="cover_after"/>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
+                                  <object class="GtkPrinterOptionWidget" id="cover_after">
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
+                                  </object>
                                  </child>
                                  <accessibility>
                                    <relation type="labelled-by" target="label_widget7"/>
                                  </accessibility>
                                </object>
                              </child>
+                            <layout>
+                              <property name="left-attach">1</property>
+                              <property name="top-attach">0</property>
+                            </layout>
                            </object>
-                          <packing>
-                            <property name="left-attach">1</property>
-                            <property name="top-attach">0</property>
-                          </packing>
                          </child>
                        </object>
                      </property>
diff --git a/gtk/ui/gtkscalebutton.ui b/gtk/ui/gtkscalebutton.ui

index 560ec39defe665261e51a1850aa29fc08176ff60..4dcdb71620897a4eebe5acdbb679db13e2441b01 100644 (file)
--- a/gtk/ui/gtkscalebutton.ui
+++ b/gtk/ui/gtkscalebutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkScaleButton" parent="GtkButton">
      <property name="can-focus">1</property>
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui

index b31078fe5b5a1384350bd1fb710a96ffe462b1fa..5b71724e29ba48ef924dbf42e0083d6bad9636b5 100644 (file)
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkSidebarRow" parent="GtkListBoxRow">
      <property name="margin-top">1</property>
diff --git a/gtk/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui

index eb0a23d53af7a0bdbccdc26c2c937118aa487432..bbd871594d899987bc0adcec089d42f780e248e0 100644 (file)
--- a/gtk/ui/gtkstatusbar.ui
+++ b/gtk/ui/gtkstatusbar.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkStatusbar" parent="GtkWidget">
      <child>
diff --git a/gtk/ui/gtktooltipwindow.ui b/gtk/ui/gtktooltipwindow.ui

index 848d4cedc46444a9003eb74917249a831eec0d64..bb4329f18b916c9ba7f01b9a5ec3805536c71a5a 100644 (file)
--- a/gtk/ui/gtktooltipwindow.ui
+++ b/gtk/ui/gtktooltipwindow.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <template class="GtkTooltipWindow" parent="GtkWindow">
      <property name="resizable">0</property>
diff --git a/gtk/ui/gtkvolumebutton.ui b/gtk/ui/gtkvolumebutton.ui

index cd5f3224d10307501f5f1640688503bd3a9f6bfc..67e881f015f0c83b074204e0175c4030131d03f5 100644 (file)
--- a/gtk/ui/gtkvolumebutton.ui
+++ b/gtk/ui/gtkvolumebutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <object class="GtkAdjustment" id="adjustment">
      <property name="upper">1</property>
author	Emmanuele Bassi <ebassi@gnome.org>
	Thu, 4 Apr 2019 23:08:18 +0000 (00:08 +0100)
committer	Emmanuele Bassi <ebassi@gnome.org>
	Thu, 4 Apr 2019 23:08:18 +0000 (00:08 +0100)
gtk/ui/gtkaboutdialog.ui		patch \| blob \| history
gtk/ui/gtkappchooserdialog.ui		patch \| blob \| history
gtk/ui/gtkappchooserwidget.ui		patch \| blob \| history
gtk/ui/gtkapplication-quartz.ui		patch \| blob \| history
gtk/ui/gtkassistant.ui		patch \| blob \| history
gtk/ui/gtkcolorchooserdialog.ui		patch \| blob \| history
gtk/ui/gtkcoloreditor.ui		patch \| blob \| history
gtk/ui/gtkcombobox.ui		patch \| blob \| history
gtk/ui/gtkdialog.ui		patch \| blob \| history
gtk/ui/gtkemojichooser.ui		patch \| blob \| history
gtk/ui/gtkemojicompletion.ui		patch \| blob \| history
gtk/ui/gtkfilechooserdialog.ui		patch \| blob \| history
gtk/ui/gtkfilechooserwidget.ui		patch \| blob \| history
gtk/ui/gtkfontchooserdialog.ui		patch \| blob \| history
gtk/ui/gtkfontchooserwidget.ui		patch \| blob \| history
gtk/ui/gtkinfobar.ui		patch \| blob \| history
gtk/ui/gtklockbutton.ui		patch \| blob \| history
gtk/ui/gtkmediacontrols.ui		patch \| blob \| history
gtk/ui/gtkmessagedialog.ui		patch \| blob \| history
gtk/ui/gtkpagesetupunixdialog.ui		patch \| blob \| history
gtk/ui/gtkpathbar.ui		patch \| blob \| history
gtk/ui/gtkplacesview.ui		patch \| blob \| history
gtk/ui/gtkplacesviewrow.ui		patch \| blob \| history
gtk/ui/gtkprintunixdialog.ui		patch \| blob \| history
gtk/ui/gtkscalebutton.ui		patch \| blob \| history
gtk/ui/gtksidebarrow.ui		patch \| blob \| history
gtk/ui/gtkstatusbar.ui		patch \| blob \| history
gtk/ui/gtktooltipwindow.ui		patch \| blob \| history
gtk/ui/gtkvolumebutton.ui		patch \| blob \| history